Now can handle indexing correctly. Patch from Arjan to do so.

1999-11-10  Jonathan Blandford  <jrb@redhat.com>

	* src/io-ras.c (OneLineMapped_file): Now can handle indexing
	correctly.  Patch from Arjan to do so.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index f8db2df1d894b864746353b1ef40eb1ac43ddc02..89733b2212cdcdf245272d6862fdf70d7107db2f 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-10  Jonathan Blandford  <jrb@redhat.com>
+
+       * src/io-ras.c (OneLineMapped_file): Now can handle indexing
+       correctly.  Patch from Arjan to do so.
+
 1999-11-10  Michael Fulbright  <drmike@redhat.com>
 
         * src/io-pnm.c (pnm_ascii_read_scanline): Fixed loading of ASCII PNM

diff --git a/gdk-pixbuf/io-ras.c b/gdk-pixbuf/io-ras.c
index 0d586a012905c8047ae8ccb46131d001a3c1197b..c45f5bb475f71e867839d544a8c3cf5406f4dd0d 100644 (file)
--- a/gdk-pixbuf/io-ras.c
+++ b/gdk-pixbuf/io-ras.c
@@ -27,7 +27,9 @@
 
 Known bugs:
        * "Indexed" (incl grayscale) sunras files don't work
-       * 1 bpp sunrasfiles don't work
+         ( 1999/11/10 - Fixed for non-progressive loading )
+       * 1 bpp sunrasfiles don't work yet
+       * Compressed rasterfiles don't work yet
 
 */
 
@@ -146,9 +148,9 @@ static void OneLineMapped_file(FILE * f, guint Width, guchar * pixels,
                (void) fread(&DummyByte, 1, 1, f);
        X = 0;
        while (X < Width) {
-               pixels[X * 3]   = Map[buffer[X]*3];
-               pixels[X * 3+1] = Map[buffer[X]*3];
-               pixels[X * 3+2] = Map[buffer[X]*3];
+               pixels[X * 3]   = Map[buffer[X]];
+               pixels[X * 3+1] = Map[buffer[X]+256];
+               pixels[X * 3+2] = Map[buffer[X]+512];
 
                X++;
        }